Merge with xenppc-unstable-merge.hg.
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Wed, 30 Aug 2006 21:36:18 +0000 (22:36 +0100)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Wed, 30 Aug 2006 21:36:18 +0000 (22:36 +0100)

Trivial merge